GtkQuery: Cleanups

Strip leading underscores from GtkQuery api, and
clean up the sources a bit.

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 5204a073f38ec4bfcd4f6549f37974e1c71e5dc0..be004bc3bc5003ee44a72a6abdf462df97c2da95 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -6274,8 +6274,8 @@ search_start_query (GtkFileChooserWidget *impl,
 
   if (!priv->search_query)
     {
-      priv->search_query = _gtk_query_new ();
-      _gtk_query_set_text (priv->search_query, query_text);
+      priv->search_query = gtk_query_new ();
+      gtk_query_set_text (priv->search_query, query_text);
     }
 
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->current_location_radio)) &&
@@ -6283,7 +6283,7 @@ search_start_query (GtkFileChooserWidget *impl,
     {
       gchar *location;
       location = g_file_get_uri (priv->current_folder);
-      _gtk_query_set_location (priv->search_query, location);
+      gtk_query_set_location (priv->search_query, location);
       g_free (location);
     }
 
@@ -6341,7 +6341,7 @@ search_setup_widgets (GtkFileChooserWidget *impl)
   /* if there already is a query, restart it */
   if (priv->search_query)
     {
-      gchar *query = _gtk_query_get_text (priv->search_query);
+      gchar *query = gtk_query_get_text (priv->search_query);
 
       if (query)
         {

diff --git a/gtk/gtkquery.c b/gtk/gtkquery.c
index 7afcb0f48e18b04288c8ab4c50672c3af2702e31..bed173ed432cd3c1e5e76bf5fcdb7913f9c9b0bd 100644 (file)
--- a/gtk/gtkquery.c
+++ b/gtk/gtkquery.c
@@ -32,7 +32,7 @@ struct _GtkQueryPrivate
   gchar **words;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtkQuery, _gtk_query, G_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (GtkQuery, gtk_query, G_TYPE_OBJECT)
 
 static void
 finalize (GObject *object)
@@ -45,40 +45,40 @@ finalize (GObject *object)
   g_free (query->priv->location_uri);
   g_strfreev (query->priv->words);
 
-  G_OBJECT_CLASS (_gtk_query_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_query_parent_class)->finalize (object);
 }
 
 static void
-_gtk_query_class_init (GtkQueryClass *class)
+gtk_query_class_init (GtkQueryClass *class)
 {
   GObjectClass *gobject_class;
-  
+
   gobject_class = G_OBJECT_CLASS (class);
   gobject_class->finalize = finalize;
 }
 
 static void
-_gtk_query_init (GtkQuery *query)
+gtk_query_init (GtkQuery *query)
 {
-  query->priv = _gtk_query_get_instance_private (query);
+  query->priv = gtk_query_get_instance_private (query);
 }
 
 GtkQuery *
-_gtk_query_new (void)
+gtk_query_new (void)
 {
   return g_object_new (GTK_TYPE_QUERY,  NULL);
 }
 
 
 gchar *
-_gtk_query_get_text (GtkQuery *query)
+gtk_query_get_text (GtkQuery *query)
 {
   return g_strdup (query->priv->text);
 }
 
-void 
-_gtk_query_set_text (GtkQuery    *query, 
-                   const gchar *text)
+void
+gtk_query_set_text (GtkQuery    *query,
+                    const gchar *text)
 {
   g_free (query->priv->text);
   query->priv->text = g_strdup (text);
@@ -88,21 +88,21 @@ _gtk_query_set_text (GtkQuery    *query,
 }
 
 gchar *
-_gtk_query_get_location (GtkQuery *query)
+gtk_query_get_location (GtkQuery *query)
 {
   return g_strdup (query->priv->location_uri);
 }
-       
+
 void
-_gtk_query_set_location (GtkQuery    *query, 
-                       const gchar *uri)
+gtk_query_set_location (GtkQuery    *query,
+                        const gchar *uri)
 {
   g_free (query->priv->location_uri);
   query->priv->location_uri = g_strdup (uri);
 }
 
 GList *
-_gtk_query_get_mime_types (GtkQuery *query)
+gtk_query_get_mime_types (GtkQuery *query)
 {
   GList *list, *l;
   gchar *mime_type;
@@ -118,8 +118,8 @@ _gtk_query_get_mime_types (GtkQuery *query)
 }
 
 void
-_gtk_query_set_mime_types (GtkQuery *query, 
-                          GList    *mime_types)
+gtk_query_set_mime_types (GtkQuery *query,
+                          GList    *mime_types)
 {
   GList *l;
   gchar *mime_type;
@@ -135,11 +135,11 @@ _gtk_query_set_mime_types (GtkQuery *query,
 }
 
 void
-_gtk_query_add_mime_type (GtkQuery    *query, 
-                         const gchar *mime_type)
+gtk_query_add_mime_type (GtkQuery    *query,
+                         const gchar *mime_type)
 {
   query->priv->mime_types = g_list_prepend (query->priv->mime_types,
-                                           g_strdup (mime_type));
+                                            g_strdup (mime_type));
 }
 
 static gchar *

diff --git a/gtk/gtkquery.h b/gtk/gtkquery.h
index 863337324fcb0ee3c3547372e355b4e17dc7f929..8f1b1d69deb63c7ec5321efb3af49f59ee59964f 100644 (file)
--- a/gtk/gtkquery.h
+++ b/gtk/gtkquery.h
@@ -26,18 +26,18 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_QUERY         (_gtk_query_get_type ())
-#define GTK_QUERY(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery))
-#define GTK_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass))
-#define GTK_IS_QUERY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY))
-#define GTK_IS_QUERY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY))
+#define GTK_TYPE_QUERY          (gtk_query_get_type ())
+#define GTK_QUERY(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery))
+#define GTK_QUERY_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass))
+#define GTK_IS_QUERY(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY))
+#define GTK_IS_QUERY_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY))
 #define GTK_QUERY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_QUERY, GtkQueryClass))
 
 typedef struct _GtkQuery GtkQuery;
 typedef struct _GtkQueryClass GtkQueryClass;
 typedef struct _GtkQueryPrivate GtkQueryPrivate;
 
-struct _GtkQuery 
+struct _GtkQuery
 {
   GObject parent;
 
@@ -49,23 +49,23 @@ struct _GtkQueryClass
   GObjectClass parent_class;
 };
 
-GType     _gtk_query_get_type       (void);
+GType     gtk_query_get_type       (void);
 
-GtkQuery* _gtk_query_new            (void);
+GtkQuery* gtk_query_new            (void);
 
-gchar*    _gtk_query_get_text       (GtkQuery    *query);
-void      _gtk_query_set_text       (GtkQuery    *query, 
-                                    const gchar *text);
+gchar*    gtk_query_get_text       (GtkQuery    *query);
+void      gtk_query_set_text       (GtkQuery    *query,
+                                    const gchar *text);
 
-gchar*    _gtk_query_get_location   (GtkQuery    *query);
-void      _gtk_query_set_location   (GtkQuery    *query, 
-                                    const gchar *uri);
+gchar*    gtk_query_get_location   (GtkQuery    *query);
+void      gtk_query_set_location   (GtkQuery    *query,
+                                    const gchar *uri);
 
-GList*    _gtk_query_get_mime_types (GtkQuery    *query);
-void      _gtk_query_set_mime_types (GtkQuery    *query, 
-                                    GList       *mime_types);
-void      _gtk_query_add_mime_type  (GtkQuery    *query, 
-                                    const gchar *mime_type);
+GList*    gtk_query_get_mime_types (GtkQuery    *query);
+void      gtk_query_set_mime_types (GtkQuery    *query,
+                                    GList       *mime_types);
+void      gtk_query_add_mime_type  (GtkQuery    *query,
+                                    const gchar *mime_type);
 
 gboolean  gtk_query_matches_string (GtkQuery    *query,
                                     const gchar *string);

diff --git a/gtk/gtksearchenginequartz.c b/gtk/gtksearchenginequartz.c
index 42f32eefdcd5117a29d3882ffeb465ba6001e976..da90c4d56ba2dbfbcbe54bf8f5fdecd72d8a7047 100644 (file)
--- a/gtk/gtksearchenginequartz.c
+++ b/gtk/gtksearchenginequartz.c
@@ -204,7 +204,7 @@ gtk_search_engine_quartz_set_query (GtkSearchEngine *engine,
   [quartz->priv->ns_query setPredicate:
     [NSPredicate predicateWithFormat:
       [NSString stringWithFormat:@"(kMDItemTextContent LIKE[cd] \"*%s*\")",
-                                 _gtk_query_get_text (query)]]];
+                                 gtk_query_get_text (query)]]];
 
   QUARTZ_POOL_RELEASE;
 }

diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c
index 613da2c29be5dcfa56a54e15f269d9072f340012..596673b591f692197ab7fe744de5091708f59a71 100644 (file)
--- a/gtk/gtksearchenginesimple.c
+++ b/gtk/gtksearchenginesimple.c
@@ -95,7 +95,7 @@ search_thread_data_new (GtkSearchEngineSimple *engine,
   data->engine = g_object_ref (engine);
   data->directories = g_queue_new ();
   data->query = g_object_ref (query);
-  uri = _gtk_query_get_location (query);
+  uri = gtk_query_get_location (query);
   if (uri != NULL)
     location = g_file_new_for_uri (uri);
   else

diff --git a/gtk/gtksearchenginetracker.c b/gtk/gtksearchenginetracker.c
index 8d9dc37077898133e3e062deac71dfe67c0233cb..cb815b7d5574a5e15ed1dbaacd69cb69f0e8ed65 100644 (file)
--- a/gtk/gtksearchenginetracker.c
+++ b/gtk/gtksearchenginetracker.c
@@ -356,8 +356,8 @@ gtk_search_engine_tracker_start (GtkSearchEngine *engine)
       return;
     }
 
-  search_text = _gtk_query_get_text (tracker->priv->query);
-  location_uri = _gtk_query_get_location (tracker->priv->query);
+  search_text = gtk_query_get_text (tracker->priv->query);
+  location_uri = gtk_query_get_location (tracker->priv->query);
 
   sparql = g_string_new ("SELECT nie:url(?urn) "
                          "WHERE {"